Handle PostgreSQL 9.4
Merge branch 'Branch_5_3'