Clear CMAKE_LIBRARY_PATH after python check
Save and restore instead
Merge branch 'chris/fix-issue-189'