Merged revisions 48381 via svnmerge from