Added support for Django 1.4 and later