Merge pull request #623 from ecsv/batadv-2020.4