[commits] [batctl] master,next: Merge branch 'next' (c821115)