PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 28001 Submitted by: Pete Fritchman <petef@databits.net>
engine.