Merged revisions 49165 via svnmerge from