Merged revisions 47380 via svnmerge from