No more black box of doom
Merge branch 'master' into Kelly

Conflicts:
	Pantimator/bin/pantimator/Paintimator.class