Merged revisions 46347 via svnmerge from