Fixes test_sandbox.py@test_clobbering()'s burning error on linux
Merge branch 'hotfix' into sandbox