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