Merge pull request #413 from ecsv/batadv-17.01