PR: ports/26997 Submitted by: Jean-Sebastien Roy <jean-sebastien.roy@wanadoo.fr>
PR: 3867 Submitted by: Paulo Menezes <paulo@isr.uc.pt>