s/simplejson/json
Merging with upstream.