Some mixer additions
Merge branch 'master' of https://github.com/wishmerhill/ua100mix