Merge pull request #332 from ecsv/batadv-2017.4