Merge pull request #1955 from paolo-sz/master

Correctly detect python in PATH
Merge remote-tracking branch 'upstream/master'