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