Merge pull request #485 from ecsv/batadv-2019.2