[commits] [batman-adv] master: Merge branch 'maint' (b7f96ca3)