Don't even mess with the CRT include dir if building with mingw
Don't re-define WIN32_LEAN_AND_MEAN
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Don't re-define WIN32_LEAN_AND_MEAN
  Don't even mess with the CRT include dir if building with mingw