Merged revisions 35915 via svnmerge from