(cherry picked from commit d83bc62511663138a20d1a9f66b0d8a442421148)

Conflicts:
	modules/audio_output/file.c