Prettier now playing and presence
Merge branch 'master' into ian