Django 1.6 backport