am 7e8586fc: Merge "Convert to C++ Bison output"

* commit '7e8586fc1e40e7d860b05757882c3617df968fb8':
  Convert to C++ Bison output