Merged revisions 238834 via svnmerge from