[glib/glib-2-56: 2/2] Merge branch 'cherry-pick-95ebaa26' into 'glib-2-56'

[Xavier Claessens <xclaesse src gnome org>]

commit c0e6cc3a4093acc73c15bca5a2b8e066477a0d8b
Merge: 69dec2db4 cfa28e152
Author: Xavier Claessens <xclaesse gmail com>
Date:   Tue Jun 5 14:43:36 2018 +0000

    Merge branch 'cherry-pick-95ebaa26' into 'glib-2-56'
    
    Merge branch '1401-g_clear_handle_id-clear_func-not-nullable' into 'master'
    
    See merge request GNOME/glib!56

 glib/gmain.c | 3 +--
 glib/gmain.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
---