Merge "Build fix with newer bison 2.6"