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

diff --cc Gemfile.lock
index d8bf51fe56ffa073ac871de335163c2bf6ae667d,9f8447196afd86c4d392886fa37ef23e5bd94460..3b47153b7480abf1a0c6a15f36f5885b25bc2220
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -220,9 -220,9 +220,9 @@@ GE
      html_tokenizer (0.0.7)
      htmlentities (4.3.4)
      http_accept_language (2.1.1)
-     i18n (0.9.5)
+     i18n (1.8.3)
        concurrent-ruby (~> 1.0)
 -    i18n-js (3.7.0)
 +    i18n-js (3.7.1)
        i18n (>= 0.6.6)
      image_optim (0.26.5)
        exifr (~> 1.2, >= 1.2.2)