Should now be Django 1.5 compatible