Merge pull request #422 from ecsv/batadv-18.06