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