Fix for the linux buildfix
Merge remote-tracking branch 'origin/master' into Universal_Audio_Branch