[commits] [batman-adv] main,main: Merge branch 'stable' (6398f63b)