Merged revisions 302417 via svnmerge from