Merge pull request #420 from ecsv/batadv-2018.3