Merged revisions 35669 via svnmerge from