Merge "Fix pretty JSON when strings end with backslashes"