Merged revisions 309808 via svnmerge from