Merged revisions 292825 via svnmerge from