Merge branch 'sh/teamspeak2'