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

diff --combined app/assets/stylesheets/common.scss
index fc774a3eecc91e4cc478ff051b866d1d5de8c12a,893dc14c84b7b4aaf8bd0960405d2ee70a133566..db03b94abe5602ed50b1ee6afd8720129d21fef2
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -66,6 -66,12 +66,6 @@@ time[title] 
    color: $blue;
  }
  
 -/* Rules for borders */
 -/* These add additional colours to those provided by bootstrap */
 -.border-grey {
 -  border-color: $grey !important;
 -}
 -
  /* Rules for the header */
  
  #menu-icon {
@@@ -321,7 -327,6 +321,6 @@@ body.small-nav 
    #sidebar {
      float: left;
      width: $sidebarWidth;
-     background: #fff;
  
      #sidebar_loader {
        display: none;