Merge branch 'rj/submodule-fsck-skip'