[gtk/color-picker: 4/4] Merge branch 'master' into 'color-picker'

[Matthias Clasen <matthiasc src gnome org>]

commit d3d361764ced488b5bdb88bf04e408d5f7ec20e4
Merge: 15a9f04aee 766e2b1e63
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jul 27 18:09:11 2018 +0000

    Merge branch 'master' into 'color-picker'
    
    # Conflicts:
    #   gtk/gen-gtk-gresources-xml.py

 gtk/gen-gtk-gresources-xml.py                      |   2 +-
 .../16x16/status/gtk-orientation-landscape.png     | Bin 0 -> 756 bytes
 .../16x16/status/gtk-orientation-portrait.png      | Bin 0 -> 543 bytes
 .../status/gtk-orientation-reverse-landscape.png   | Bin 0 -> 751 bytes
 .../status/gtk-orientation-reverse-portrait.png    | Bin 0 -> 557 bytes
 .../24x24/status/gtk-orientation-landscape.png     | Bin 0 -> 1097 bytes
 .../24x24/status/gtk-orientation-portrait.png      | Bin 0 -> 931 bytes
 .../status/gtk-orientation-reverse-landscape.png   | Bin 0 -> 1059 bytes
 .../status/gtk-orientation-reverse-portrait.png    | Bin 0 -> 940 bytes
 testsuite/gtk/check-icon-names.c                   |  50 +++++++++++++++++++--
 10 files changed, 47 insertions(+), 5 deletions(-)
---