now really use python 2.7, if it exists
Merge branch 'master' into prefer-python-2.7