Merge branch 'scintilla-532'