game-music-emu: Merge branch 'master' of bitbucket.org:mpyne/game-music-emu (a39d9)

[Couldn't obtain the patch due to network issues; please check the above link instead.]