Merged revisions 346763 via svnmerge from