Version 2.0.7: Upgrades for Django 1.5+