rolled back
Merge branch 'MusicQuery' of https://github.com/mdoleh/Jukebox into MusicQuery