[gtk: 7/7] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit a923be95b36f1303a90d232c55b6f373c3fa8f3e
Merge: daf3b3a3b4 44c6619660
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 22 14:52:57 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2736

 demos/gtk-demo/images.c     |   4 +-
 gtk/a11y/gtkatspiaction.c   | 105 ++++++++++++++++++++++++++++++++++++++++++--
 gtk/gtkcolorbutton.c        |  39 +++++++++++++++-
 gtk/gtkcolorswatch.c        |  67 ++++++++++++++++++++--------
 gtk/gtkcolorswatchprivate.h |   4 ++
 gtk/gtkpicture.c            |   5 +++
 6 files changed, 200 insertions(+), 24 deletions(-)
---