Merge "Consistent use of USE_MINGW"