Fix for audio not reinitializing on restart.
Merge branch 'master' into unstable