Include Postgres headers
Merge branch 'include-postgres-headers'
Change list terminator
Merge branch 'change-list-terminator'