master
Merge branch 'upstream-1.8'
Use PlatformId instead of string names.
Fix warnings in Web build.