Merge remote-tracking branch 'origin/pr/40' into windows-integration

# Conflicts:
#	crates/disktree-app/src/tests.rs