[commits] [batman-adv] master: Merge branch 'maint' (2c9eb8f)