am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"

* commit '8ac188ff0e739ea75ea02166c54428245200f088':
  Consistent use of USE_MINGW