Merge branch 'scintilla/update-366'