Backporting a few bug fixes for pigeonhole (sieve)
Release 2.2.13-2 (backporting pigeonhole bugfixes)