Merge pull request #535 from ecsv/batadv-2019.5