small mod .gitignore
Merge branch 'master' into 4.0.1-branch