This v6 is just Fabien's v5, rebased over a very minor conflict, and
pgindented. No further changes. I've marked this Ready for Committer.
--
Álvaro Herrera https://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services