Merge branch 'release/0.9.3.3' into develop
Bug fix: missing root directory for a machine would cause an exception. A missing root should just not contain any files.
Version Bump: 0.9.4
Merge branch 'release/v0.9.4'