Pull in changes to the OSX defaults from upstream