previously only addressed the JSON encoding for reply callbacks. Now we're covered.
Merge branch 'json_content_type' into me_plus_upstream