Merge pull request #1570 from rubenk/detect-bison