Added support for Django 1.6