Merge pull request #518 from ecsv/batadv-2019.4