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

diff --cc app/assets/stylesheets/common.scss
index 7df0cdc5258882e176be998f6a3e00a01889e281,97ed5907135d992c6da34bf612d52ede75368654..1329d05f4a644d8b4cc5188c151e6361ea5e18d5
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -96,11 -98,8 +96,7 @@@ header 
    position: relative;
    font-size: 14px;
  
-   h1, nav, nav > ul, nav > ul > li {
-     display: inline-block;
-   }
- 
    > * {
 -    height: 100%;
      padding: $lineheight * 0.5;
    }