Apparently this change got lost somewhere

No idea what the hell happened
Merge branch 'master' into albumart