Imported Upstream version 20140424
Merge tag 'upstream/20140424'

Upstream version 20140424
Use modified version with modified PG 9.0, 9.1 support