Merged revisions 45452 via svnmerge from