Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.rst
	doc/backends/google.rst
	doc/configuration.rst
	doc/miscellaneous.rst
	example/app/pipeline.py
	example/app/views.py
	example/local_settings.py.template
	example/settings.py
	example/templates/home.html
	social_auth/__init__.py
	social_auth/backends/__init__.py
	social_auth/backends/browserid.py
	social_auth/backends/contrib/github.py
	social_auth/backends/contrib/instagram.py
	social_auth/backends/facebook.py
	social_auth/backends/google.py
	social_auth/backends/pipeline/misc.py
	social_auth/backends/twitter.py
	social_auth/tests/google.py
	social_auth/utils.py
	social_auth/views.py