Merged revisions 309403 via svnmerge from