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

diff --combined app/assets/stylesheets/common.scss
index 4a0352c854790da7a5ce616118cdd6827fc8003b,3941464cba84f06e5f515d9234c7ee39cacdeaa4..16c986618fafe8a9c2f9b574be93c02b8a15ed2d
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -565,10 -565,6 +565,6 @@@ body.small-nav 
  
  /* Rules for attribution text under the main map shown on printouts */
  
- #attribution {
-   display: none;
- }
- 
  .donate-attr { color: darken($green, 10%) !important; }
  
  /* Rules for the sidebar */
@@@ -638,8 -634,9 +634,8 @@@ header .search_forms
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
 -  ul li {
 -    cursor: pointer;
 -    &.selected { background: $list-highlight; }
 +  ul li.selected {
 +    background: $list-highlight;
    }
  
    .search_more .loader {
@@@ -647,6 -644,11 +643,6 @@@
    }
  }
  
 -.search_results_error {
 -  color: #f00;
 -  padding: 10px 20px;
 -}
 -
  /* Rules for routing */
  
  div.direction {
@@@ -660,6 -662,8 +656,6 @@@ div.direction.i#{$i} { background-posit
  }
  
  td.distance {
 -    color: $darkgrey;
 -    text-align: right;
      font-size: x-small;
  }
  tr.turn {