Sync with latest from https://github.com/juliocamarero/jukebox