Merge pull request #196 from ecsv/batman-adv-2016.2