Updated gitattributes.
Merge branch 'master' into Cameron-Work