Merged revisions 45818 via svnmerge from