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