issue #24559 - backport to 4.6.1

backport fix and bump version for web-only release
@shackbarth - Should this be here? I needed to merge the PG_VERSION changes to test with PG 9.3.