envset [2]
Merge branch 'master' into thor