Added support to Django 1.7+