Audio updates
Merge commit 'd84f090da69d041909c47c799c082ac51745f538' into aaron_mac
Merge commit '8826745636d87c589a9cd6ab58e63911fcc86e73' into aaron_mac
More sound updates
merge from aaron_mac into Maxim