Another fix for clang.
Merge branch '1.3.x'