Merged revisions 48391 via svnmerge from