Merge branch 'scintilla-520'