Merged revisions 49636 via svnmerge from