Merge branch 'scintilla/gtk-3-20' into gtk-3-20-fixes