Improve metadata handling to prevent artwork appearing and disappearing
Merge branch 'master' into 2.6.0

Conflicts:
	default.py