Rewrite code for merging contours
Workaround against corrupted CFF
Merge branch 'devel' into topic/heavyfont

Conflicts:
	mkmkfile.rb