Merge branch 'develop-envir' into 'master'

Undo environment fun

See merge request !26
1 job for master
in 50 seconds, using 0 compute credits, and was queued for 3 seconds