bump maint-0.2.4 to 0.2.4.25-dev
Whoops, bump the version properly.
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
bump maint-0.2.5 to 0.2.5.9-rc-dev
Merge remote-tracking branch 'origin/maint-0.2.5'

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