fixed bug cause by bb-inserted-spaces in .zip
Merge commit '2063333fe' into fp