Merge remote-tracking branch 'github_ysagon/ROOT-v5.34.36-intel-2016a-Python-2.7.11' into ROOT_fix_PYTHONPATH