Merged revisions 377384 via svnmerge from