PR: ports/5427 Submitted by: maintainer
PR: 5096 Submitted by: Brian Handy <handy@physics.montana.edu>