Bug 348073 download as zip on empty directory gives ugly message.
Merge remote-tracking branch 'origin/Bug348073' into Bug348073