Merge branch 'scintilla-365'