Merge pull request #658 from ecsv/batadv-for-19.07