0.8.6: Django 1.5 compatibility