Merge pull request #325 from ecsv/batadv-2017.3