Merge branch 'develop'
Fix bug in implicit accept.
Improve task toString.
Merge branch 'master' into develop