am a8614ada: Merge "Build fix with newer bison 2.6"

* commit 'a8614adaf3a38d693c9715bfe5addada00b41da6':
  Build fix with newer bison 2.6