Fix deploy timeout
Merge pull request #1278 from psav/deploy_timeout

Fix deploy timeout