Merged revisions 136241 via svnmerge from