[commits] [batman-adv] main,main: Merge branch 'stable' (2aa54a15)