Thanks to Trac alias ppetrid for the report and Tim for the review.

Conflicts:
	django/db/models/deletion.py
	tests/delete/tests.py

Forward port of 7c3ef199 from stable/1.8.x