Merge branch 'master' of github.com:demoiselle/scheduler
Merge branch 'master' of github.com:demoiselle/scheduler