Merge commit '533de2d7a9875ff652be477a3f6c817d66a3d3d9' Submitted by: Frederic Cambus Differential Revision: https://reviews.freebsd.org/D40378
git-subtree-dir: contrib/spleen git-subtree-mainline: 3582acbad3 git-subtree-split: 5eab6333fa Reviewed by: imp [earlier] Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D20653
3582acbad3
5eab6333fa