Fix docs for Mac OS X start guide.
Merge remote-tracking branch 'origin/develop' into develop