Merged revisions 134883 via svnmerge from