Merge pull request #269 from ecsv/batadv-fixes