Merge branch 'jk/fsck-doc'