Minor: one more generated file added to .gitignore
Merge branch 'master' into Windows