Merged revisions 45026 via svnmerge from