Merged revisions 46526 via svnmerge from