am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit '2e5157fa05dca31b2d409c185a6ca5230182503d':
  Fix build with gcc-4.8 and array boundaries issue