Merge branch 'scintilla-update-354'