small fix
Merge branch 'develop' into linux-build