Added Django 1.4 compatibility