Merge proposals

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