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

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