Merge remote-tracking branch 'mreitz/block' into queue-block