[gjs: 3/3] Merge branch 'fixes' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 4c2579293e4b1c2fe07fc571cc715df179541d33
Merge: e14435c8 5e5b6928
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed May 9 05:06:16 2018 +0000

    Merge branch 'fixes' into 'master'
    
    Tweaks
    
    Closes #156
    
    See merge request GNOME/gjs!140

 test/extra/{do_jhbuild.sh => do_environment.sh} | 21 +++++++++++++++++++
 test/test-ci.sh                                 | 27 +++----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)
---