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

This is an 'ours' merge, to avoid taking the bump to 0.2.6.10-dev