fix typo
Merge branch 'develop' into develop.osx
Merge branch 'develop.osx' into master.osx