diff --git a/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js b/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js
index 120c9c0..2a0c38c 100644
--- a/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js
+++ b/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* global define, require, window, document */
diff --git a/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js b/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js
index d7a9d76..a4e2699 100644
--- a/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js
+++ b/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  *
  * Based on Julian Aubourg's ajaxHooks xdr.js:
  * https://github.com/jaubourg/ajaxHooks/
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js
index a33f9f4..abc2155 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js
index 7b9119d..822f9ce 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js
index b20b502..8787d38 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js
index ac978b7..52e2f0e 100755
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js
index ba09945..9e95ba4 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js
index 61d0a4a..da8bfde 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js
index 312256d..748defe 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* global define, require, window */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js
index cfd008c..325861f 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js
index a524778..4e313a0 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js
@@ -6,7 +6,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
@@ -1080,6 +1080,8 @@
         _handleFileTreeEntry: function (entry, path) {
             var that = this,
                 dfd = $.Deferred(),
+                entries = [],
+                dirReader,
                 errorHandler = function (e) {
                     if (e && !e.entry) {
                         e.entry = entry;
@@ -1107,8 +1109,7 @@
                             readEntries();
                         }
                     }, errorHandler);
-                },
-                dirReader, entries = [];
+                };
             path = path || '';
             if (entry.isFile) {
                 if (entry._file) {
@@ -1311,6 +1312,10 @@
             this._off(this.options.fileInput, 'change');
         },
 
+        _destroy: function () {
+            this._destroyEventHandlers();
+        },
+
         _setOption: function (key, value) {
             var reinit = $.inArray(key, this._specialOptions) !== -1;
             if (reinit) {
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js b/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js
index b7922e6..8d25c46 100644
--- a/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js
+++ b/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js
@@ -6,10 +6,10 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/* global define, require, window, document */
+/* global define, require, window, document, JSON */
 
 ;(function (factory) {
     'use strict';
@@ -27,7 +27,14 @@
     'use strict';
 
     // Helper variable to create unique names for the transport iframes:
-    var counter = 0;
+    var counter = 0,
+        jsonAPI = $,
+        jsonParse = 'parseJSON';
+
+    if ('JSON' in window && 'parse' in JSON) {
+      jsonAPI = JSON;
+      jsonParse = 'parse';
+    }
 
     // The iframe transport accepts four additional options:
     // options.fileInput: a jQuery collection of file input fields
@@ -197,7 +204,7 @@
                 return iframe && $(iframe[0].body).text();
             },
             'iframe json': function (iframe) {
-                return iframe && $.parseJSON($(iframe[0].body).text());
+                return iframe && jsonAPI[jsonParse]($(iframe[0].body).text());
             },
             'iframe html': function (iframe) {
                 return iframe && $(iframe[0].body).html();
diff --git a/app/assets/stylesheets/jquery.fileupload-noscript.scss b/app/assets/stylesheets/jquery.fileupload-noscript.scss
index d0dda3a..8c80bf4 100644
--- a/app/assets/stylesheets/jquery.fileupload-noscript.scss
+++ b/app/assets/stylesheets/jquery.fileupload-noscript.scss
@@ -7,7 +7,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileinput-button input {
diff --git a/app/assets/stylesheets/jquery.fileupload-ui-noscript.scss b/app/assets/stylesheets/jquery.fileupload-ui-noscript.scss
index 6ad2ad6..30651ac 100644
--- a/app/assets/stylesheets/jquery.fileupload-ui-noscript.scss
+++ b/app/assets/stylesheets/jquery.fileupload-ui-noscript.scss
@@ -7,7 +7,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileinput-button i,
diff --git a/app/assets/stylesheets/jquery.fileupload-ui.scss b/app/assets/stylesheets/jquery.fileupload-ui.scss
index b349a0f..a99a67d 100644
--- a/app/assets/stylesheets/jquery.fileupload-ui.scss
+++ b/app/assets/stylesheets/jquery.fileupload-ui.scss
@@ -7,7 +7,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileupload-buttonbar .btn,
diff --git a/app/assets/stylesheets/jquery.fileupload.scss b/app/assets/stylesheets/jquery.fileupload.scss
index f714c4d..8ae3b09 100644
--- a/app/assets/stylesheets/jquery.fileupload.scss
+++ b/app/assets/stylesheets/jquery.fileupload.scss
@@ -7,7 +7,7 @@
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileinput-button {
diff --git a/jquery-fileupload-rails.gemspec b/jquery-fileupload-rails.gemspec
index cb88ca0..634be91 100644
--- a/jquery-fileupload-rails.gemspec
+++ b/jquery-fileupload-rails.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "jquery-fileupload-rails"
 
-  s.files = Dir["lib/**/*"] + Dir["app/**/*"] + ["Rakefile", "README.md"] 
+  s.files = Dir["lib/**/*"] + Dir["app/**/*"] + ["README.md"]
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]