Merge branch 'update-scintilla'