Merged revisions 305692 via svnmerge from