Merged revisions 340165 via svnmerge from