Sound Server wait (Alessandro committing for Arthur, lyra)
Merge branch 'master' of https://github.com/febret/omicron into HEAD