Merged revisions 48966 via svnmerge from