Merge pull request #349 from ecsv/batadv-2018.0