Merged revisions 34400 via svnmerge from