pg cursor for gid
Merge branch 'master' into production