Merge branch 'scintilla/gtk3-dead-windows'