Release/2.6

This pull request will remain open until it is time for release/2.6 to be merged into master.

release/2.6 is essentially the version of PG that was in pg-dev (master branch) before the move on March 10.