Some slight behaviour modifications to the queue.
It's a bit wonky, but it works pretty damn well.
Merge remote-tracking branch 'origin/master'