Adding in some Django 1.5 compatibility