Reginald, Other things

you have encountered a Reginald
Merge branch 'Geoffs_WIP'
Merge remote-tracking branch 'origin/master' into lockhart