Squashed 'stronghash/' changes from ec630c1..0db4669

0db4669 Fix error

git-subtree-dir: stronghash
git-subtree-split: 0db466953220f4831668305f23218b6d25e7312a
Merge commit 'd92b75dba41ad60140c3327db7d13acdbb948c6b'