- Patch #563106 by adrian, David_Rothstein: more upgrade path fixes to help contrib updates make progress.