Merge r1876410 from trunk: * r1876410 Fix the .editorconfig stanza for Makefile's. Justification: Make $EDITOR do the right thing on any backport branches we may create off this stabilization branch. Votes: +1: danielsh, stsp, jamessan