bass update
Merge branch 'master' of https://github.com/d0n/bass