Merged revisions 52904 via svnmerge from