[commits] [batman-adv] next's head updated: Merge branch 'maint' into next (7996b58)