Merged revisions 48372 via svnmerge from