Fixed broken build
Merge branch 'develop' into develop.macosx