More un-uniquifying.
Merge branch 'newio'

Conflicts:
	audio/audio_decoder.cpp
	audio/audio_decoder.hpp