Make compatible with Django 1.4 and up