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