Merged revisions 50466 via svnmerge from