Bump maint-0.2.5 to 0.2.5.7-rc-dev
Merge branch 'maint-0.2.5' into release-0.2.5

This is a "theirs" merge, to get the version number bumped to
0.2.5.7-rc-dev.