yes
Merge remote-tracking branch 'origin/new-type' into new-type

Conflicts:
	bin/jarlist.cache
Merge remote-tracking branch 'origin/new-type' into new-type