Allow directories in edit-chroot -f.
Merge branch 'master' into croagh