Squashed 'hump/' content from commit e10fa66

git-subtree-dir: hump
git-subtree-split: e10fa66e60c5984a8d92801163d23811b7ac509f
Merge commit '2ad964cddbc248d370401a5ab70440f808d246b4' as 'hump'