Merge branch 'scintilla-4'