PR: ports/60121 Submitted by: Thierry Thomas <thierry@pompo.net>
PR: 54761 Submitted by: thierry@pompo.net