Merge pull request #1253 from rubenk/fix-osx-build