[commits] [batman-adv] next: Merge branch 'maint' into next (6e16a7d)