Fixed #20462 - Replaced the str() cast introduced in 273dc55 by force_text()
Merge pull request #1308 from loic/ticket20462

Fixed #20462 - Replaced the str() cast introduced in 273dc55 by force_text()
Fixed #14881 -- Modified password reset to work with a non-integer UserModel.pk.

uid is now base64 encoded in password reset URLs/views. A backwards compatible
password_reset_confirm view/URL will allow password reset links generated before
this change to continue to work. This view will be removed in Django 1.7.

Thanks jonash for the initial patch and claudep for the review.
Add missing preposition in documentation
Merge pull request #1309 from treyhunner/patch-1

Add missing preposition in documentation.