Merged revisions 48155 via svnmerge from