[gjs: 4/4] Merge cherry picks from ptomato!1

[Philip Chimento <pchimento src gnome org>]

commit 26909da6d7651927f278482d88c72e37ba77c201
Merge: 05f1502d 510e1980
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Oct 7 16:20:01 2019 -0700

    Merge cherry picks from ptomato!1
    
    See GNOME!338

 gi/object.cpp             | 7 +++----
 gi/object.h               | 2 +-
 gjs/context-private.h     | 4 +---
 gjs/context.cpp           | 4 ++++
 gjs/jsapi-util-root.h     | 3 +--
 test/gjs-test-rooting.cpp | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
---