Display "undefined" on toString of invalid JSON
Merge branch 'master' into scala-2.10