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

Conflicts:
	Makefile
Merge branch 'master' into german

Conflicts:
	Makefile