Merge pull request #316 from ecsv/batadv-2017.2