Partial solution to #1212 (needs testing on other platforms)
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge pull request #1255 from andyjenkinson/next

Mac companion sound fix (partial for #1212)