Merge branch 'master' into develop
tweak implicit accept
tweak Task.toString()
Merge remote-tracking branch 'origin/develop'