[commits] [batman-adv] master: Merge branch 'next' (2a938c7)