0dd1bec30fed2c10ef01cc7782e331ea0d1a1f47 from master; fix sometimes-missing audio...