[glib: 2/2] Merge branch 'imports' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit fecaa5a5ea6ca82a226c072dd1a8e986c5edcf7a
Merge: 89f964e33 2709d5e1b
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri May 1 17:05:05 2020 +0000

    Merge branch 'imports' into 'master'
    
    Don't fail a test if optional dependencies are not present
    
    Closes #2083
    
    See merge request GNOME/glib!1448

 gio/tests/memory-monitor-dbus.py.in   | 164 ++++++++++++++--------------
 gio/tests/memory-monitor-portal.py.in | 196 ++++++++++++++++++----------------
 2 files changed, 188 insertions(+), 172 deletions(-)
---