Merged revisions 134814 via svnmerge from