Merged revisions 49458 via svnmerge from