merged with commit ce04926dbee2ab1204ed34e50dbce53f0303bde1 of https://github.com/ghisguth/tasks/