Merged revisions 299248 via svnmerge from