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

* mreitz/block:
  block/vdi: Limit maximum size even futher