Merge branch 'po/etc-gitattributes' into next