Merged revisions 292628 via svnmerge from