Merge "Don't use GNU make new shell assignment operator"