Music plugin fixes
Merge branch 'master' of github.com:sasq64/utils