Merge pull request #307 from play/bonjour

Bonjour
Merge branch 'v3' into speakers