PR: 25094 Submitted by: Phil Regnauld <regnauld@td.rh.dk>
Patches submitted by: Jim Sloan <odinn@atlantabiker.net>, to whom I am extremely grateful! Thanks!