Using latest OS X as base SDK
Merge remote-tracking branch 'upstream/master'