Re-build svn:ignore as .gitignore.
Merge branch 'master' into feature-thru-exception