Merged revisions 339885 via svnmerge from