Quick patch update 20150729 - Fix to address audio/crash issue

Just pushed patch to address issue with users crashing if using 7.1 setup.

All previous patches incorporated.