Merge branch 'master' into 1.6.x
diff --git a/tests/tests.js b/tests/tests.js
index 0efc64e..04a3e72 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -437,7 +437,7 @@
                     };
 
                     specContext.transfer.download(fileURL, specContext.localFilePath, downloadWin, downloadFail);
-                }, DOWNLOAD_TIMEOUT);
+                }, DOWNLOAD_TIMEOUT * 10); // to give Heroku server some time to wake up
 
                 it("filetransfer.spec.5 should download a file using http basic auth", function (done) {
                     var fileURL = SERVER_WITH_CREDENTIALS + "/download_basic_auth";