Merged revisions 292225 via svnmerge from