PR: 44746 Submitted by: Nick Hilliard <nick@foobar.org>
Pointed out by: Claudiu Bosioc <cbo@uem.utt.ro>
PR: 16446 Submitted by: Alexander Langer <alex@cichlids.com>