Simon Peyton Jones authored Aug 14, 2012 and pcapriotti committed Aug 15, 2012

Thanks to Paolo for most of the work.

MERGED from commit 3fabf48e