Now works with Django versions >= 1.5