Added a missing file to .gitattributes
Merge remote-tracking branch 'origin/1.1'