Merged revisions 53434 via svnmerge from