Merge garyb's changes to the Prelude