Merged revisions 46778 via svnmerge from