Merge branch 'master' into moderation

diff --cc .rubocop_todo.yml
Simple merge

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/assets/stylesheets/common.scss
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc config/locales/en.yml
index 40237b63baf77326a86b7430f7a22d290594a5e0,2412a2b9c27e1baddccffddaab032a452b4d0143..a40f1571978a44023071bee0e3960be77e2a5333
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1326,14 -1278,16 +1382,16 @@@ en
        License page</a> for details.
      legal_title: Legal
      legal_html: |
 -      This site and many other related services are formally operated by the  
 -      <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
 -      on behalf of the community. Use of all OSMF operated services is subject 
 +      This site and many other related services are formally operated by the
 +      <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
 +      on behalf of the community. Use of all OSMF operated services is subject
        to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
 -      <br> 
 -      Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> 
 -      if you have licensing, copyright or other legal questions.
 +      <br>
 +      Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
 +      if you have licensing, copyright or other legal questions and issues.
+       <br>
+       OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
      partners_title: Partners
    notifier:
      diary_comment_notification:

diff --cc test/test_helper.rb
Simple merge