v20211101.4413

This is a nightly build off the tip of 'master'. It may be unstable and result in corrupted configurations or data loss. Use only for testing.

Changes:

Merge pull request #401 from klutvott123/folder-file-cleanup