PR: 5909 Submitted by: Josh Gilliam <josh@quick.net>
PR: 5835 Submitted by: Josh Giliam <josh@quick.net>