Merge pull request #270 from ecsv/batadv-17.01