Merged revisions 49834 via svnmerge from