Fix MinGW Platform Detect problem
Merge branch 'master' into experimental
Fix platform support