Merged revisions 292906 via svnmerge from