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

diff --combined .rubocop_todo.yml
index 26a50cb97c26b1d6f17e4a50162df74e316f2cfb,22890e7c78c44d963bd9d22168e326a1943fa3ce..7d2c583eb73c4ebff19e52adc3367559e83757c2
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -19,7 -19,7 +19,7 @@@ Lint/AssignmentInCondition
      - 'app/helpers/application_helper.rb'
      - 'app/helpers/browse_helper.rb'
      - 'app/models/client_application.rb'
 -    - 'app/models/notifier.rb'
 +    - 'app/mailers/notifier.rb'
      - 'lib/nominatim.rb'
      - 'lib/osm.rb'
      - 'script/deliver-message'
@@@ -32,7 -32,7 +32,7 @@@ Lint/HandleExceptions
  
  # Offense count: 692
  Metrics/AbcSize:
-   Max: 280
+   Max: 283
  
  # Offense count: 40
  # Configuration parameters: CountComments, ExcludedMethods.
@@@ -48,7 -48,7 +48,7 @@@ Metrics/BlockNesting
  # Offense count: 63
  # Configuration parameters: CountComments.
  Metrics/ClassLength:
-   Max: 1795
+   Max: 1801
  
  # Offense count: 72
  Metrics/CyclomaticComplexity: