Merged revisions 301134 via svnmerge from