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