Grim Reaper Changes

This request has all the grim reaper changes and without the history
this time I hope.
Merge branch 'GrimReaper' of https://github.com/MarkL1961/CorsixTH into GrimReaper