Merged revisions 49831 via svnmerge from