Merge pull request #469 from ecsv/batadv-for-18.06