Update .gitignore
Merge branch '1.8'