Merged revisions 135473 via svnmerge from