Merge pull request #282 from ecsv/batadv-2017.0