(cherry picked from commit 31150350679286f873c94fc670ddbafddaed7163)

Conflicts:

	src/control/media_player.c