Merged revisions 49925 via svnmerge from