Merged revisions 50006 via svnmerge from