Merged revisions 339942 via svnmerge from