Merge pull request #386 from ecsv/batadv-17.01