[commits] [batman-adv] next: Merge branch 'maint' into next (3b1bf5a)