Merged revisions 342277 via svnmerge from