Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
Add break_time_increase to perPlayerDifficulty