Merge remote-tracking branch 'reference/2.4.0' into feature/pytest

Conflicts:
	rest_framework/runtests/urls.py
	tests/test_response.py
	tox.ini

1 files changed, 2 insertions, 1 deletions

diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index e5fa4194..c125ac8a 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -2,10 +2,11 @@
 Helper classes for parsers.
 """
 from __future__ import unicode_literals
+from django.utils import timezone
 from django.db.models.query import QuerySet
 from django.utils.datastructures import SortedDict
 from django.utils.functional import Promise
-from rest_framework.compat import timezone, force_text
+from rest_framework.compat import force_text
 from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata
 import datetime
 import decimal