git-svn-id: trunk@44130 - (cherry picked from commit 04ad607bb4) # Conflicts: # .gitattributes
04ad607bb4