Merged revisions 51198 via svnmerge from