[commits] [batman-adv] master: Merge branch 'next' (4c4512f)