Code

Merge branch 'jc/maint-clean-nested-dir-safety' into maint