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