[commits] [batman-adv] master, next: Merge branch 'maint' into next (804b3a8)