Upstream catch-up
Merge branch 'master' of github.com:mushkevych/scheduler