Merge branch 'master' into sound
Sound on pause and resume
Merge branch 'sound'