Add default variables to groovy shell
Merge remote-tracking branch 'github/master'