add django imports backwards-compatible
Merge remote-tracking branch 'origin/friendly_response' into friendly_response