Merged revisions 337542 via svnmerge from