Fix for unzipping of files when there is a space in the name.
Merge branch 'master' into development for unzip files fix.