Merge branch 'scintilla-update'