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

diff --cc Gemfile.lock
index 309992f75a1273f93052ee3403a1b7508b562bea,b1903ceef800334c751876a57b64707bd113c0ae..bbc6dcd47fd76fa60065f589164d4b9089677c63
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -403,9 -403,9 +403,9 @@@ GE
        parser (>= 2.7.1.4)
      rubocop-minitest (0.10.1)
        rubocop (>= 0.87)
-     rubocop-performance (1.7.1)
-       rubocop (>= 0.82.0)
+     rubocop-performance (1.8.0)
+       rubocop (>= 0.87.0)
 -    rubocop-rails (2.7.1)
 +    rubocop-rails (2.8.0)
        activesupport (>= 4.2.0)
        rack (>= 1.1)
        rubocop (>= 0.87.0)