PR: 170586 Submitted by: Waitman Gobble <uzimac at da3m0n8t3r.com>
PR: 116300 Submitted by: alepulver