Django 1.8 compatibility fixes (closes #742)