Merged revisions 50433 via svnmerge from