Merged revisions 45066 via svnmerge from