Made some preliminary changes to code and copied these changes back into
our repository
Merge remote-tracking branch 'origin/master'
Okay, another try at this, same as my previous message, I changed a bit
of code and have copied this code back.