Fixed an erroneous import in example code.
Merge pull request #900 from bmispelon/ticket-20022

Fix #20022: Correctly handle prefixes with url-unsafe characters in reverse()
Fixed #20032 -- Documented how to simulate the absence of a setting

Thanks Ram Rachum for the report.
Began implementing a shared set of test models to speed up tests.
Merge branch 'master' of github.com:django/django
Fixed #16649 -- Refactored save_base logic

Model.save() will use UPDATE - if not updated - INSERT instead of
SELECT - if found UPDATE else INSERT. This should save a query when
updating, but will cost a little when inserting model with PK set.

Also fixed #17341 -- made sure .save() commits transactions only after
the whole model has been saved. This wasn't the case in model
inheritance situations.

The save_base implementation was refactored into multiple methods.
A typical chain for inherited save is:
save_base()
    _save_parents(self)
        for each parent:
            _save_parents(parent)
            _save_table(parent)
    _save_table(self)
Fixed #20039 -- Fixed has_changed form detection for required TypedChoiceFields

Thanks Florian Apolloner for the report and the review.
Also fixes #19643.
Updated release instructions to account for website automation.
Add a specific error message for URLValidator
Fixed #17051 -- Removed some 'invalid' field error messages

When the 'invalid' error message is set at field level, it masks
the error message raised by the validator, if any.
Deprecated django.views.defaults.shortcut.
Fixed #17502 -- Made joining in inheritance cases consistent

The original problem was that when filtering two levels up in
inheritance chain, Django optimized the join generation so that the
middle model was skipped. But then Django generated joins from top
to middle to bottom for SELECT clause, and thus there was one extra
join (top->middle->bottom + top -> bottom).

This case is fixed in master as the filtering optimization is gone.
This has the side effect that in some cases there is still extra join
if the SELECT clause doesn't contain anything from middle or bottom.
Corrected typos in the 1.6 release notes
Discouraged filing PRs that won't be noticed.
Merge pull request #901 from giamfreeg/master

Fixed an erroneous import in example code of docs (class-based-views/intro).
Fixed #20053 -- Fix `index_together` documentation
Merge pull request #905 from cyberj/ticket_20053

Fixed #20053 -- Fix `index_together` documentation