Imported Upstream version 2.2.6
Merge tag 'upstream/2.2.6'

Upstream version 2.2.6
Updated pigeonhole to 0.4.2
Updated changelog for new release

Git-Dch: Ignore