One extra calendar fix for tasks
Merge branch 'master' of https://github.com/panjiw/Team-Player