Merged revisions 378915,378918 via svnmerge from