Improved artwork logic
fix accidental comment out of setinfo
Merge branch 'master' into 2.6.0

Conflicts:
	default.py