search for G4 variables in env keys, not values
bug fix
Merge remote-tracking branch 'mjmottram/master'