Merged revisions 299626 via svnmerge from