Changes from upstream pull request: fix for JSON emitter in Django 1.5
https://bitbucket.org/jespern/django-piston/pull-request/25/compatibility-fix-for-json-emitter-with/diff

Conflicts:

	piston/emitters.py