Merged revisions 54235 via svnmerge from