Fix misprint
Merge branch 'develop' into linux