Merge branch 'release/4.1' into release/4.2

Gemfile

@@ -129,7 +129,7 @@ gem 'unicorn'
 # Gems we don't depend directly on, but specify here to make sure we don't use a vulnerable
 # version. Please add a link to a security advisory when adding a Gem here.
 
-gem 'rack', '~>1.4.6'
+gem 'rack', '~>1.4.7'
 
 gem 'i18n', '~> 0.6.8'
 # see https://groups.google.com/forum/#!topic/ruby-security-ann/pLrh6DUw998

Gemfile.lock

@@ -332,7 +332,7 @@ GEM
       railties (>= 3.1, < 5.0)
     rabl (0.9.3)
       activesupport (>= 2.3.14)
-    rack (1.4.6)
+    rack (1.4.7)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (4.2.0)
@@ -551,8 +551,8 @@ DEPENDENCIES
   pry-stack_explorer
   quiet_assets
   rabl (= 0.9.3)
-  rack (~> 1.4.6)
   rack-attack
+  rack (~> 1.4.7)
   rack-protection!
   rack-test (~> 0.6.2)
   rack_session_access