Merged revisions 120282 via svnmerge from