This thread seems to have died down without any fix being proposed.Simon, you own this open item.
-- Álvaro Herrera https://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services