Fixed bug in Json toString method
Workaround kind-safety compile error
Merge branch 'master' into scala-2.11
Updated for Scala 2.11