PR: 24058 Submitted by: Joseph Scott <joseph@randomnetworks.com> (maintainer)
PR: 23312 Submitted by: Joseph Scott <joseph@randomnetworks.com> Reviewed by: sobomax