PR: 53950 Submitted by: Ng Pheng Siong <ngps@post1.com> (mainttainer)
PR: 26155 Submitted by: Peter Haight <peterh@sapros.com>