Merged revisions 307065 via svnmerge from