Okay, I seem to misunderstand the Eclipse git settings - this merge
shouldn't be necessary.
Merge remote-tracking branch 'origin/master'