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

diff --combined app/assets/stylesheets/common.scss
index f50bf328ead68c4b2a1571649c3df2a1faa5363f,73fd24296bd4beeaf56b912988897ad7599d03ae..02bddc800faf6f4bc5296fc8974ee684903be969
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -591,10 -591,6 +591,6 @@@ body.small-nav 
  }
  
  .share-ui {
-   .share-tab {
-     display: none;
-   }
- 
    .share-link {
      input[type=text],
      textarea {
@@@ -611,6 -607,10 +607,6 @@@
      }
    }
  
 -  #embed_html {
 -    resize: vertical;
 -  }
 -
    #mapnik_scale {
      width: 100px;
    }