PR: 3248 Submitted by: NAKAMURA Kazushi <nkazushi@highway.or.jp>
Closes PR #2601. Submitted by: Pedro Giffuni <pgiffuni@FPS.biblos.unal.edu.co>