hopefully fix environments via gitfs
Merge branch 'master' into experimental