PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 33361 Submitted by: Seamus Venasse <svenasse@polaris.ca>