Synchronising master with my branch

Hopefully this is me syncing changes from the Jeremy's master down to my fork.  If not, I apologise!