Silence clang warning about losing integer precision
Merge branch 'develop'