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

This is an "ours" merge so we can leave the version in master alone.