Merge pull request #271 from OLSR/master