PR: 64116 Submitted by: Petr Rehor <Petr.Rehor@i.cz> Approved by: Kim Scarborough <sluggo@unknown.nu>
PR: 28977 Submitted by: Kim Scarborough <user@unknown.nu>