Merged revisions 51195 via svnmerge from