Merge proposals

postgresql96-pgpool2-35-snap has no merge proposals.