Merged revisions 129047 via svnmerge from