Merged revisions 309445 via svnmerge from