cherry picked .gitignore from master