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

diff --combined app/assets/stylesheets/common.scss
index fb580fb7b540f4cf4015ecd3653ecb7bd3358890,ae942428802647dd24528e91ec40d86bb239567b..5a033bd0b6a3ed8e26cecf1c9d33930f8b29e89a
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1144,30 -1144,12 +1144,12 @@@ tr.turn:hover 
    .inbox-row-unread {
      background: #CBEEA7;
    }
- 
-   .right {
-     float: right;
-   }
  }
  
  .inbox-row .inbox-mark-read {
    display: none;
  }
  
- .info-line {
-   margin-bottom: $lineheight;
-   padding: $lineheight/4 0px 4px 0px;
-   border-bottom: 1px solid $grey;
- 
-   form, form div {
-     display: inline;
-   }
- }
- 
- .info-line .user_thumbnail_tiny {
-   vertical-align: middle;
- }
- 
  .inbox-sent {
    white-space: nowrap;
  }
@@@ -1216,8 -1198,15 +1198,8 @@@ img.user_thumbnail_tiny 
    max-height: 25px;
  }
  
 -/* Rules for geo microformats */
 -
 -abbr.geo {
 -  border-bottom: none;
 -}
 -
  /* General styles for action lists / subnavs */
  
 -
  nav.secondary-actions {
    margin-left: -11px;
    overflow: hidden;
@@@ -1244,6 -1233,24 +1226,6 @@@ div.secondary-actions 
    text-align: center;
  }
  
 -/* Create a single-line dl */
 -
 -dl.dl-inline {
 -  dt, dd {
 -    display: inline-block;
 -  }
 -  dd {
 -    margin-right: 1em;
 -  }
 -}
 -
 -/* Rules for OpenID logo */
 -
 -.openid_logo {
 -  vertical-align: text-bottom;
 -  border: 0;
 -}
 -
  /* Rules for rich text */
  
  .richtext,