Improve compatibility with Django 1.5