Merge "Fix build on XCode 8 w/OSX 10.12 SDK"