Now with more in your face!
Merge remote-tracking branch 'origin/master'