fix python on os x
Merge branch 'PythonOSX'