Fix the score being half of what it's supposed to be.
Merge remote-tracking branch 'origin/master'