Merged revisions 295673 via svnmerge from