gitignore new end line
Rename translation file
Merge remote-tracking branch 'origin/master' into 2.1