Include fade
Merge branch 'AudioManager' into NewMaster