PR: 18439 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
PR: 11460 Submitted by: Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>