Merged revisions 299312 via svnmerge from