Merge remote-tracking branch 'github_ysagon/ROOT-v6.06.02-intel-2016b-Python-2.7.12' into ROOT_fix_PYTHONPATH