Merge "Fix compilation with clang and GCC 4.7"