Merged revisions 51159 via svnmerge from