Difficulty settings now actually have effect on the game
Merge remote-tracking branch 'origin/master'