PR: 27588 Submitted by: David W. Chapman Jr. <dwcjr@inethouston.net>
PR: 24805 Submitted by: Oyvind Albrigtsen