Added Django 1.6 support while maintaining backwards compatibility.