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