Readd scheduler to reenigne's commits.
Fix merge conflicts
Merge branch 'master' of github.com:reenigne/reenigne