[commits] [batman-adv] next: Merge branch 'next' (061486b)