Merge remote-tracking branch 'origin/maint-0.2.4'

This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22-dev.