Merge pull request #556 from ecsv/batadv-for-17.01

No match.