Fixed test failures on Python 3 - refs #12288
Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
Fixed #9057 -- Added default_permissions model meta option.

Thanks hvendelbo for the suggestion and koenb for the draft patch.
Document new field API in release notes
Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/models/options.py
SQLite test fix -- refs #9057
Fixed #18356 -- Gave the test client signals.template_rendered call a unique dispatch_uid

This prevents the test client context from being lost when the client
is used in a nested fashion.
Remove useless override of self.style
utils.importlib is deprecated
Remove other color_style override
Remove commented-out print
Remove pointless fetch_results param
Add [y/n] to autodetector questions and allow for default value
Remove pointless comment.
Merge pull request #1447 from evansd/patch-1

Use `usegmt` flag in formatdate
Fixed #20868 -- Added an email to django-announce as a security step.

Thanks garrison for the report.
Fixed #20828 -- Allowed @permission_required to take a list of permissions

Thanks Giggaflop for the suggestion.
Back SortedSet onto OrderedDict, rename it, and a few typo fixes
Docs tweaks (thanks timgraham)
Test that django.views.static.serve() generates 404 status codes.

Also, change tests to be based on SimpleTestCase.