Code

Merge branch 'jk/maint-rmdir-fix' into maint