Merge "deploy.sh does not work on Mac os x because untar directory is created before...