Merge branch 'develop' into feature/end-of-track

Conflicts:
	mopidy/audio/actor.py
	mopidy/backends/spotify/playback.py