Merge pull request #273 from OLSR/master