Merge branch 'stable'

* stable:
  gsql: Fix escaping of quotes in JSON