Merge branch 'cb/khash-maybe-unused-function'