Merge pull request #367 from ecsv/batadv-2018.1