Fix serialization bugs
Merge branch 'master' into UI
Fix bug with scores