schedulers fixes
Merge branch 'lollipop-5' of github.com:anvol/dlxpul-lollipop into lollipop-5