Improve Django 1.6 compatibility.