[commits] [batman-adv] master: Merge branch 'maint' (058ce961)