Merge branch 'scintilla-371'