Merge "Remove no longer needed "make" target" into guilin