Merge pull request #380 from ecsv/batadv-2018.1