- Filestorage:
  Fix from Malte
Merge remote-tracking branch 'intranet-filestorage/master'