Merge pull request #605 from pmelange/olsrd-bison-3-7-1-changes