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

This is an "ours" merge to avoid bumping the version number in master.