Merge pull request #427 from ecsv/batadv-2018.4