Merge "Fix Clang 3.1 compile error"