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

diff --combined app/assets/stylesheets/common.scss
index 88a8047debee9156cb9333f8bee847ff61a8bf12,9075c5864af3eab7338a7c55d5fe6f40ffd343f9..2cfd5eba732348b338be53952e627319efc59f5c
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -580,6 -580,14 +580,6 @@@ header .search_forms
    }
  }
  
 -/* Rules for search sidebar */
 -
 -#sidebar .search_results_entry {
 -  .search_more .loader {
 -    display: none;
 -  }
 -}
 -
  /* Rules for routing */
  
  td.distance {
@@@ -683,9 -691,7 +683,7 @@@ tr.turn 
  /* Rules for non-map content pages */
  
  .content-inner {
-   position: relative;
    max-width: 960px;
-   margin: auto;
    padding: $lineheight;
  }