Backport of dd0b487872de4e3ff966da51e3610bac996e44f0 from master
* override_settings may now be imported from django.test * removed Approximate from django.test * updated documentation for things importable from django.test Thanks akaariai for the suggestion.