Merged revisions 309204 via svnmerge from