PR: ports/83926 Submitted by: Michael Stowe
PR: 15738 Submitted by: Paul M. Lambert <plambert@plambert.net>