Merged revisions 117479 via svnmerge from