diff --git a/Gemfile b/Gemfile
index cf4bca9048e..f2197895acd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake', '10.1.0'
 gem 'rails', '4.2.1'
+gem 'rack', '~> 1.6.1'  # Bug in Rack 1.6.0 prevents large forms being uploaded in Multipart mode
 gem 'statsd-ruby', '~> 1.2.1', require: 'statsd'
 gem 'mysql2'
 gem 'jquery-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3a2d19aa23c..d279887d64c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -267,7 +267,7 @@ GEM
       pry (~> 0.10)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.0)
+    rack (1.6.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-cache (1.2)
@@ -472,6 +472,7 @@ DEPENDENCIES
   poltergeist (~> 1.5.1)
   pry-byebug
   quiet_assets
+  rack (~> 1.6.1)
   rack-test (~> 0.6.3)
   rack_strip_client_ip (= 0.0.1)
   rails (= 4.2.1)