Merge tag '2.1.2' into 2.1

Many type cleanups, new resolver, new types and updated documentation
Merge branch 'master' into 2.1
fix mantype dependency

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
Merge branch 'fix_manrelease'