Merge branch 'release/1.2'
changes to audio loader
Merge branch 'master' into develop