Merged revisions 309720 via svnmerge from