gustafn
committed
on 01 Dec 17
Backport from HEAD