Upgrade postgres to 9.3.x
Merge branch 'postgres-9.3'