Merge branch 'bc/editorconfig'