Updated to support removed imports in Django 1.6