Run make copyfrommakego
#4512
+25
−18
Merged
make copyfrommakego
#4512
make copyfrommakego
#4512