Merge "Correct name of gitattributes file"