PR: 151074 Submitted by: Mikhail Tsatsenko <m.tsatsenko@mail.ru>
PR: 130542 Submitted by: "Joseph S. Atkinson" <jsa@wickedmachine.net>