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