Merge branch 'externals-unicode-paths' of git://github.com/aroben/git into devel