Merge pull request #1282 from mcnewton/debjson