... to b8c75146 (typed-packaging branch)

Fixes the shortlink problem with the Document plugin for #1760.

(Also brings in some dead code removal)