Update 4.25

A few significant bug fixes and a few other significant things (like
some serious code revamping to the registry functions in Storage).
Figured I should push it.