jbigkit-2.1
Merge branch 'master' into mingw-w64

Conflicts:
	Makefile