Merged revisions 133578 via svnmerge from