[commits] [batman-adv] master: Merge branch 'maint' (9b5ed2dd)