PR: 23355 (mostly) Submitted by: Cyrille Lefevre <clefevre@citeweb.net>, maintainer mods Approved by: maintainer