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