Merge pull request #490 from RussellSenior/fix-olsrd