[gjs: 5/5] Merge branch 'march-maintenance' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit e9f4c12efd4fc7a29281fba1440a4b2859c4e9d1
Merge: 74ad71bf 9141f847
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Sat Mar 31 00:34:01 2018 +0000

    Merge branch 'march-maintenance' into 'master'
    
    March maintenance
    
    See merge request GNOME/gjs!113

 Makefile-test.am               |  2 +-
 Makefile.am                    |  8 +++++---
 installed-tests/extra/gjs.supp | 17 +++++++++++++++--
 test/extra/do_jhbuild.sh       |  2 +-
 test/test-ci.sh                |  2 +-
 util/log.cpp                   | 24 ------------------------
 util/log.h                     |  8 --------
 7 files changed, 23 insertions(+), 40 deletions(-)
---