Changed reference on the status for Mac OS X.
Merge branch 'master' into of21