Merge branch 'release-1.1'
Merge branch 'master' into manpage
Add missing descriptions to img2sixel manpage
Merge branch 'manpage' into release-1.1