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