Merge branch 'scintilla'