Merged revisions 34911 via svnmerge from