Merged revisions 296534 via svnmerge from