make non-standard python install path work too
Merge branch 'master' into develop