Merge branch 'scintilla-3.5.3'