Merge "Fix build with gcc-4.8 and array boundaries issue"