Hotfix for PYTHON_PREFIX detection
Merge branch 'release-1.9.1'