Merged revisions 376791 via svnmerge from