fix typo
Merge branch 'develop' into develop.osx