Merged revisions 292083 via svnmerge from