Merged revisions 49523 via svnmerge from