Add missing ignored files to .gitignore
Merge remote-tracking branch 'upstream/master'