Merge pull request #396 from ecsv/batadv-2018.2