Fixes for building with 2014r3.
Merge branch 'master' of https://github.com/macoslib/macoslib into Yosemite