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

diff --combined app/assets/stylesheets/common.scss
index 75c901660c1ee3e23cd94b51846d0c716ef7c3e0,8cd9e2b402003df873b92fb38f8519c97d93e4b0..00b2be4d7d985f73ea9e782741013078dd32a732
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1216,8 -1216,15 +1216,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;
@@@ -1255,13 -1262,6 +1255,6 @@@ dl.dl-inline 
    }
  }
  
- /* Rules for OpenID logo */
- 
- .openid_logo {
-   vertical-align: text-bottom;
-   border: 0;
- }
- 
  /* Rules for rich text */
  
  .richtext,