Remerged OS X branch
Remerged OS X branch