Sync backend with boilerplate#2

mkleszcz wants to merge 4 commits intomasterapptension/django-restauth:masterfrom

feature/sync-with-boilerplateapptension/django-restauth:feature/sync-with-boilerplateCopy head branch name to clipboard