Merge remote-tracking branch 'github/master'

Conflicts:
	000-last.playlist
	hora-de-aventuras.playlist
	vickie.playlist