Merged revisions 82335 via svnmerge from