Closes #344 (closed).
Also upgrade pigeonhole to 0.5.11.
Merge details
merged
mentioned in commit 2043e028