Update .gitignore
Merge commit 'e21865f2adcd4ad16cbf29cdd35c7bed1669ddd0' into HEAD