Merged revisions 339407 via svnmerge from