Workaround for detecting intersections
Merge branch 'topic/intersect' into devel
Merge branch 'devel' into topic/heavyfont

Conflicts:
	mkmkfile.rb