Merged revisions 377214 via svnmerge from