gustafn
committed
on 20 Dec 18
backport from HEAD for PG 11