Merged revisions 49028 via svnmerge from