removed some verbosity that no-one wants...
Merge remote-tracking branch 'origin/master'