Add .gitignore files
Merge branch '4.2'
Fix version