Fix issue with file permissions on OSX
Merge branch 'release/0.1.17'