Merged revisions 292085 via svnmerge from