PR: 25025 Submitted by: R Joseph Wright <rjoseph@mammalia.org>
Original port PR: ports/20168 Originally submitted by: R Joseph Wright <rjoseph@mammalia.org>