Cherry-pick fixes from hedleyroos/django-janrain@development
Merge branch 'pick_hedleyroos_development' into development
Merge remote-tracking branch 'github/development' into development

Conflicts:
	janrain/views.py