Merged revisions 50562 via svnmerge from