PR: 38553 Submitted by: maintainer
PR: 28622 Submitted by: Paul Marquis <pmarquis@pobox.com>
Closes PR #2154. Submitted by: Pedro Giffuni <pgiffuni@FPS.biblos.unal.edu.co>