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

diff --combined Gemfile.lock
index 47ebfe4c8b3ecef0f97b256f2eb4178c46afc956,f0c73d888479c8c66cff4c6bfd2d6329e10d19ef..309992f75a1273f93052ee3403a1b7508b562bea
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -113,7 -113,7 +113,7 @@@ GE
      bootstrap_form (4.5.0)
        actionpack (>= 5.2)
        activemodel (>= 5.2)
-     brakeman (4.9.0)
+     brakeman (4.9.1)
      browser (4.2.0)
      builder (3.2.4)
      bzip2-ffi (1.0.0)
@@@ -333,7 -333,7 +333,7 @@@
      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)