Merged revisions 51989 via svnmerge from