[commits] [batman-adv] master: Merge branch 'maint' into master (2552daa1)