Merge "Fix build problems with gcc-4.6.x."