Explain what these files are for
Merge remote-tracking branch 'upstream/master'