Add support for two new types and bump to v1.1
Patch from Andrzej Rybczak
Merge branch 'upstream'