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

[Matthias Clasen <matthiasc src gnome org>]

commit b5b8f42a0c6ac94722c62a27c0635b6484f5d72d
Merge: 32b826e312 043ffd38bc
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 21 18:09:42 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #3285
    
    See merge request GNOME/gtk!2733

 gtk/gtkcolumnview.c | 19 ++++++++++++++++++-
 gtk/gtkframe.c      | 21 +++++++++++++++++++++
 gtk/gtkrange.c      | 13 +++++++------
 gtk/gtktext.c       |  8 +++++---
 gtk/gtkvideo.c      |  2 +-
 5 files changed, 52 insertions(+), 11 deletions(-)
---