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

diff --combined app/assets/stylesheets/common.scss
index 42046c0a62f270c6e49086cd3abe6eb26761f4ea,b40c60835401d509586e8d5797e6ac0507132533..629d26a814be9bf633c582fbdd8dec12c99d47b4
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -90,7 -90,6 +90,6 @@@ time[title] 
  header {
    height: $headerHeight;
    position: relative;
-   z-index: 1001;
    font-size: 14px;
  
    h1, nav, nav > ul, nav > ul > li {
@@@ -329,7 -328,6 +328,6 @@@ body.small-nav 
  
    .overlay-sidebar #sidebar {
      position: absolute;
-     z-index: 1000;
      height: auto;
      overflow: hidden;
  
@@@ -396,7 -394,6 +394,6 @@@
      }
  
      #map-ui {
-       z-index: 9999;
        width: 100%;
        height: 50%;
        overflow-y: scroll;
@@@ -815,6 -812,10 +812,6 @@@ tr.turn:hover 
  }
  
  .search_form {
 -  #query {
 -    z-index: 0;
 -  }
 -
    .describe_location {
      font-size: 10px;
    }