Merge pull request #553 from ecsv/batadv-2020.0