Update manifest.json
Merge branch 'master' into F1