Merged revisions 337902 via svnmerge from