Sound Control: sync to https://github.com/faux123/mako/commit/36c6b6448fd33e3c098c5e258d2f2872962294eb