adds mention for os x specific branch
Merge branch 'master' into mac-osx