Merged revisions 45327 via svnmerge from