[commits] [batman-adv] next: Merge branch 'maint' into next (1ed6b1f)