Merged revisions 49073 via svnmerge from