PR: 16470 Submitted by: Steve Coltrin <spcoltri@unm.edu>
Closes PR #2398. Submitted by: Simon Marlow <simonm@dcs.gla.ac.uk>