Update d-t-m to 271a373d (master branch)
Update Annotator to 42b8bb1c (typed-packaging branch)

Fixes #1219.
Fixes #1227.