Submitted by: Simon Marlow <simonm@dcs.gla.ac.uk>
Closes PR #2398. Submitted by: Simon Marlow <simonm@dcs.gla.ac.uk>