Merged revisions 340718 via svnmerge from