Reviewed by: will
PR: 27591 Submitted by: David W. Chapman Jr. <dwcjr@inethouston.net>
PR: 26519 Submitted by: Mark Pulford <mark@kyne.com.au>