Merged revisions 52952 via svnmerge from