[commits] [batman-adv] master: Merge branch 'maint' (6ffe4d5c)