Merged revisions 45692 via svnmerge from