Merge remote-tracking branch 'upstream/pull/2816'

diff --combined Gemfile.lock
index 9d063dc8864c5503e05c0f18b545e57e111e7a7e,7c05b90fbf85a118f05b9e3ddf80d9ecb11b2c32..47ebfe4c8b3ecef0f97b256f2eb4178c46afc956
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -333,7 -333,7 +333,7 @@@ GE
      progress (3.5.2)
      psych (3.2.0)
      public_suffix (4.0.5)
-     puma (4.3.5)
+     puma (4.3.6)
        nio4r (~> 2.0)
      quad_tile (1.0.1)
      r2 (0.2.7)
@@@ -405,7 -405,7 +405,7 @@@
        rubocop (>= 0.87)
      rubocop-performance (1.7.1)
        rubocop (>= 0.82.0)
 -    rubocop-rails (2.7.1)
 +    rubocop-rails (2.8.0)
        activesupport (>= 4.2.0)
        rack (>= 1.1)
        rubocop (>= 0.87.0)