Merged revisions 45040 via svnmerge from