git-svn-id: trunk@44037 - (cherry picked from commit 7892e3f7b7) # Conflicts: # .gitattributes
7892e3f7b7