Merged revisions 339831 via svnmerge from