Merge pull request #495 from ecsv/batadv-2019.3