Update .gitignore
Merge branch 'upstream'