+ editorconfig
merge master