Merge branch 'scintilla-357'