Merged revisions 299353 via svnmerge from