Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Update to reflect current MSVC build situation

Conflicts:
	doc/platform.texi

See: ec0b0c2bMerged-by: Michael Niedermayer <michaelni@gmx.at>