Merge pull request #583 from ecsv/batadv-2020.2