Merge remote-tracking branch 'upstream/master' into null-one-to-one

1 files changed, 1 insertions, 1 deletions

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index a4ae717d..0a34abaa 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -8,10 +8,10 @@ REST framework also provides an HTML renderer the renders the browsable API.
 """
 import copy
 import string
+import json
 from django import forms
 from django.http.multipartparser import parse_header
 from django.template import RequestContext, loader, Template
-from django.utils import simplejson as json
 from rest_framework.compat import yaml
 from rest_framework.exceptions import ConfigurationError
 from rest_framework.settings import api_settings