Merge remote-tracking branch 'upstream/master'

diff --cc README.rst
Simple merge

diff --cc social_auth/backends/__init__.py
Simple merge

diff --cc social_auth/backends/facebook.py
Simple merge

diff --cc social_auth/backends/google.py
Simple merge

diff --cc social_auth/views.py
Simple merge