Merge branch 'master' into filters

Conflicts:
	rest_framework/compat.py
	rest_framework/filters.py

rest_framework/compat.py

@@ -96,6 +96,7 @@ def clean_manytomany_helptext(text):
             text = text[:-69]
         return text
 
+
 # Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
 # Fixes (#1712). We keep the try/except for the test suite.
 guardian = None

rest_framework/filters.py

@@ -15,7 +15,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from rest_framework.compat import (
-    crispy_forms, distinct, django_filters, get_model_name, guardian
+    crispy_forms, distinct, django_filters, guardian
 )
 from rest_framework.settings import api_settings