Merge branch 'master' into no_sound