fix for clang
Merge branch 'develop' into me