Merged revisions 339088 via svnmerge from