Now works with > Django 1.4