[gjs: 6/6] Merge branch 'july-maintenance' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3d5c024d91231e63731542524af3622a8efabfae
Merge: f6bb7ac8 d1d7dafc
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Fri Aug 2 16:44:00 2019 +0000

    Merge branch 'july-maintenance' into 'master'
    
    July maintenance
    
    See merge request GNOME/gjs!315

 gi/arg.cpp            | 10 +++++++---
 gi/function.cpp       |  2 ++
 gjs/console.cpp       |  2 +-
 gjs/jsapi-util-root.h | 14 ++++++--------
 gjs/macros.h          | 14 ++++++++++----
 5 files changed, 26 insertions(+), 16 deletions(-)
---