Merged revisions 51182 via svnmerge from