okay, more audio issues fixed.  thank god.
Merge remote-tracking branch 'origin/master'