Merge pull request #238 from ecsv/batman-adv-2016.4