Merged revisions 90607 via svnmerge from