Merge pull request #241 from ecsv/batman-adv-2016.4-maint-2016-10-29