Merge branch 'olsrd'