Merge "Fix build with GCC 4.7"