PR: ports/48797 Submitted by: Thierry Thomas <thierry@pompo.net>
PR: ports/44473 Submitted by: Thierry Thomas <thierry@pompo.net>