Merged revisions 339089 via svnmerge from