Merge branch 'scintilla-372'