Merged revisions 376691 via svnmerge from