PR: 22982 Submitted by: Joseph Scott <joseph@randomnetworks.com>
PR: 19255 Submitted by: Philippe Lefebvre <nemesis@balistik.net>