Fix restore problem with backups containing both compressed and
uncompressed files.
Merge branch '1.3-master'