PR: 14877 Submitted by: Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>
PR: 3867 Submitted by: Paulo Menezes <paulo@isr.uc.pt>