Fixes #1862. Taken from 15c4d46.
Also, changed indent style in .editorconfig to spaces for txt files, to reduce diff noise.