Merge pull request #1601 from unxed/editorconfig