Merge branch 'scintilla-update-342'