[gjs: 4/4] Merge branch 'april-maintenance' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 037b23a60a3e5d57b93d094eb735fd8302db82fe
Merge: a61cf6cb 247a4cda
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu May 6 03:52:28 2021 +0000

    Merge branch 'april-maintenance' into 'master'
    
    April maintenance
    
    See merge request GNOME/gjs!616

 doc/Hacking.md     | 2 +-
 gjs/context.cpp    | 7 ++++---
 modules/system.cpp | 8 ++++++--
 tools/heapdot.py   | 4 ++++
 4 files changed, 15 insertions(+), 6 deletions(-)
---