[glib: 8/8] Merge branch 'master' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit f876f4174fe87925fe2199998e7f5048f1bfe87c
Merge: b0278604f 00cc15881
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Aug 17 12:49:03 2018 +0000

    Merge branch 'master' into 'master'
    
    gio: icons should fallback to non-preferred style appropriately.
    
    See merge request GNOME/glib!72

 gio/gthemedicon.c  | 233 +++++++++++++++++++++++++++++++++++------------------
 gio/tests/g-icon.c |  31 ++++---
 2 files changed, 177 insertions(+), 87 deletions(-)
---