Recommits most of f1ee1689c6 but without the SDKROOT and MACOSX_DEPLOYMENT_TARGET changes. We will want to make those changes eventually though and must do so before full testing begins for next release.
f1ee1689c6