Merged revisions 45027 via svnmerge from