#20432: Fix for GroupAdmin test
Fixes #19919: get_language_from_request() disregards "en-us" and "en" languages
when matching Accept-Language
Fixed argument order for localized_fields to ensure backwards compatibility
Merge pull request #1100 from ambv/issue19919

Fixed #19919: get_language_from_request() disregards en-us and en
Merge pull request #1101 from erikr/master

Fixed argument order for localized_fields to ensure backwards compatibility
Fixed #9595 -- Allow non-expiring cache timeouts.

Also, streamline the use of 0 and None between cache backends.
Merge pull request #1088 from jacobb/upstream

#20432: Fix for GroupAdmin test
Fixed #18998 - Prevented session crash when auth backend removed

Removing a backend configured in AUTHENTICATION_BACKENDS should not
raise an exception for existing sessions, but should make already
logged-in users disconnect.
Thanks Bradley Ayers for the report.
Slightly reworked imports in contrib.auth.__init__
Added stripping of whitespace for SlugField and URLField
Merge pull request #1113 from denibertovic/master

Fixed #18761 -- Added whitespace stripping to URLField and SlugField.
Merge pull request #2 from django/master

Merge with master Django branch.