Merge branch 'editorconfig'