Merged revisions 45410 via svnmerge from