Ported to Django 1.5.x