Merge pull request #562 from ecsv/batadv-2020.1