Is this correct at all? :3
Scheduler fixes
Merge remote-tracking branch 'origin/master'