Bring in line with the Django 1.5 template