Merged revisions 136726 via svnmerge from