Merge branch 'scintilla-update-script'