Update master to fit the mac branch improvements