Merge pull request #177 from ecsv/batadv_2016.1