Merged revisions 50405 via svnmerge from