Merge pull request #379 from ecsv/batadv-2018.1