'or content' does us no good.
Merge pull request #1667 from Lukasa/json2

Second time lucky for json related fixes.