Tentative fix for Clang build configuration issue.
Merge branch 'develop'