DONUT-166: Adding Django 1.6 Support