Merge pull request #3419 from kissg1988/simplejson