Merge pull request #312 from tribal-tec/master

More OS X clang 5.1 fixes