Merge pull request #243 from ecsv/batman-adv-2016.5