Attempting a compilation fix for gcc / clang.
Merge branch 'master' into GlobalFixes