Merge pull request #384 from ecsv/batadv-2018.1