JSON.parse pg output before sending to psm callback
Merge branch 'master' into published

* master:
  JSON.parse pg output before sending to psm callback