Merge "Fix build with gcc-4.8"