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

diff --combined app/assets/stylesheets/common.scss
index fbc4e25422e94d54b279ce31de051d938b92eb2d,bc599c17dc4417179b2da37f3115bd8184ce4f22..563082f5d08b7be5a03eda1b63ef8f950c54e129
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -405,6 -405,10 +405,6 @@@ body.small-nav 
      #sidebar_content {
        padding: $spacer;
      }
 -
 -    > div {
 -      position: relative;
 -    }
    }
  
    .overlay-sidebar #sidebar {
@@@ -428,11 -432,6 +428,6 @@@
  
    .welcome {
      display: none;
- 
-     p {
-       font-size: 110%;
-       font-weight: 300;
-     }
    }
  
    #banner {