Merge branch 'libzdb-2.11.2'

Landed in gentoo-x86. This also merges any changes between the trees