Merge branch 'jk/fsck-dot-in-trees'