Fix the Platform version for now
Merge branch 'master' into fluxify