Merged revisions 50727 via svnmerge from