Merge branch 'develop'
Fix postgres paramterized query.