Fix build on OSX 10.10
Fix lint issue
Merge branch 'master' into builds
7.826