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

diff --combined .rubocop_todo.yml
index 57f876bd9cd53924d75faebf1f29c58d98002f52,ee559e4b630499bfb3bb5bdb4dc82aa74e548ecd..518e1eda47fde8461c99941b0e88ab12c2aace70
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -1,12 -1,12 +1,12 @@@
  # This configuration was generated by
  # `rubocop --auto-gen-config`
- # on 2019-10-07 20:37:25 +0100 using RuboCop version 0.75.0.
+ # on 2019-10-19 16:05:52 +0000 using RuboCop version 0.75.0.
  # The point is for the user to remove these configuration records
  # one by one as the offenses are removed from the code base.
  # Note that changes in the inspected code, or installation of new
  # versions of RuboCop, may require this file to be generated again.
  
- # Offense count: 34
+ # Offense count: 35
  # Configuration parameters: AllowSafeAssignment.
  Lint/AssignmentInCondition:
    Exclude:
@@@ -32,7 -32,7 +32,7 @@@ Lint/HandleExceptions
      - 'app/controllers/api/amf_controller.rb'
      - 'app/controllers/users_controller.rb'
  
- # Offense count: 700
+ # Offense count: 701
  Metrics/AbcSize:
    Max: 189
  
@@@ -52,11 -52,11 +52,11 @@@ Metrics/BlockNesting
  Metrics/ClassLength:
    Max: 645
  
- # Offense count: 73
+ # Offense count: 74
  Metrics/CyclomaticComplexity:
    Max: 22
  
- # Offense count: 721
+ # Offense count: 722
  # Configuration parameters: CountComments, ExcludedMethods.
  Metrics/MethodLength:
    Max: 179
@@@ -64,14 -64,14 +64,14 @@@
  # Offense count: 2
  # Configuration parameters: CountComments.
  Metrics/ModuleLength:
-   Max: 107
+   Max: 117
  
  # Offense count: 4
  # Configuration parameters: CountKeywordArgs.
  Metrics/ParameterLists:
    Max: 9
  
- # Offense count: 71
+ # Offense count: 72
  Metrics/PerceivedComplexity:
    Max: 25
  
@@@ -183,7 -183,6 +183,7 @@@ Style/Documentation
  Style/FormatStringToken:
    Exclude:
      - 'app/models/concerns/geo_record.rb'
 +    - 'app/views/api/map/_bounds.xml.builder'
      - 'lib/bounding_box.rb'
      - 'test/controllers/api/map_controller_test.rb'
      - 'test/controllers/api/relations_controller_test.rb'
@@@ -209,7 -208,7 +209,7 @@@ Style/IfUnlessModifier
  Style/NumericLiterals:
    MinDigits: 11
  
- # Offense count: 3330
+ # Offense count: 3338
  # Cop supports --auto-correct.
  # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
  # URISchemes: http, https