PR: 11588 Submitted by: Chris Piazza <cpiazza@home.net>
PR: 10489 Submitted by: Brett Taylor <brett@peloton.physics.montana.edu>