Merge remote branch 'upstream/master', updating to support latest changes

Conflicts:
	example/templates/done.html
	example/templates/home.html

diff --cc example/templates/done.html
index fa4ff189b1927da634ec40e6c3f14bc5bc14c8f6,47305453b91d0ab87c6a6218aa1734d732999de9..b492cb00bde6e5c3e3dc42792db5b6795a2e0d98
--- 1/example/templates/done.html
--- 2/example/templates/done.html
+++ b/example/templates/done.html
@@@ -56,19 -56,8 +56,19 @@@
          </div>
        </form>
      </li>
 +    <li>
 +      <form action="/login/yandex/" method="post">{% csrf_token %}
 +        <div>
 +          <label for="openid_ya_user">Yandex user
 +            {% if yandex %} <span class="associated">(associated)</span>{% endif %}:
 +          </label>
 +          <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
 +          <input type="submit" value="Login"/>
 +        </div>
 +      </form>
 +    </li>
      <li>
-       <form action="/associate/openid/" method="post">{% csrf_token %}
+       <form action="{% url associate_begin "openid" %}" method="post">{% csrf_token %}
          <div>
            <label for="openid_identifier">Other provider:</label>
            <input id="openid_identifier" type="text" value="" name="openid_identifier" />

diff --cc example/templates/home.html
index 6126124963cf17b1becb19b4e931c3fb5ede2bbe,c040c2c3ed50a374a87203c5d823fda06b184e4e..15652f2abf41058ec83db9bd55c2d80cb68ac6f6
--- 1/example/templates/home.html
--- 2/example/templates/home.html
+++ b/example/templates/home.html
@@@ -27,17 -27,8 +27,17 @@@
          </div>
        </form>
      </li>
 +    <li>
 +      <form action="/login/yandex/" method="post">{% csrf_token %}
 +        <div>
 +          <label for="openid_ya_user">Yandex user:</label>
 +          <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
 +          <input type="submit" value="Login"/>
 +        </div>
 +      </form>
 +    </li>
      <li>
-       <form action="/login/openid/" method="post">{% csrf_token %}
+       <form action="{% url begin "openid" %}" method="post">{% csrf_token %}
          <div>
            <label for="openid_identifier">Other provider</label>
            <input id="openid_identifier" type="text" value="" name="openid_identifier" />

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