Merge remote-tracking branch 'upstream/master'

Conflicts:
	example/settings.py
	social_auth/backends/__init__.py
	social_auth/backends/contrib/vkontakte.py
	social_auth/backends/contrib/yandex.py

diff --cc README.rst
Simple merge

diff --cc example/settings.py
index bbf2113a4b304a88edf8257566b66c246c527398,29f3ae63ebfbfe7b39988e50f1fa90de57064e0c..46ae9e79bb4a7fa48fa2b874859e74ee03d48d90
--- 1/example/settings.py
--- 2/example/settings.py
+++ b/example/settings.py
@@@ -79,7 -79,10 +79,8 @@@ AUTHENTICATION_BACKENDS = 
      'social_auth.backends.contrib.flickr.FlickrBackend',
      'social_auth.backends.contrib.instagram.InstagramBackend',
      'social_auth.backends.contrib.github.GithubBackend',
 -    'social_auth.backends.contrib.vkontakte.VkontakteBackend',
      'social_auth.backends.contrib.yandex.YandexBackend',
 -    'social_auth.backends.contrib.yandex.YaruBackend',
+     'social_auth.backends.contrib.yahoo.YahooOAuthBackend',
      'social_auth.backends.OpenIDBackend',
      'social_auth.backends.contrib.livejournal.LiveJournalBackend',
      'social_auth.backends.browserid.BrowserIDBackend',

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