Don't reference guids if you're gonna use a staging site, dummy.
Merge remote-tracking branch 'origin/master'