Don't meta-merge a project into itself.

Should fix #1555.
Merge remote-tracking branch 'upstream/master'