Merged revisions 45106 via svnmerge from