Fix OS X clang 5.1 build
Merge pull request #311 from eile/master

Fix OS X clang 5.1 build