Merge "Add *.orig to .gitignore"