Fix CLANG build.
Merge branch 'stable'