Merge branch 'jh/fsck-promisors'