Merge branch 'scintilla/autoc-sizing'