v0.7.26
Merge branch 'master' into psa2

Conflicts:
	social_auth/__init__.py