Merge proposals dependent on lp:~twisted-dev/pydoctor/twisted-templates-2

lp:~twisted-dev/pydoctor/twisted-templates-2 has no merge proposals.