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

diff --cc app/assets/stylesheets/common.scss
index 00b2be4d7d985f73ea9e782741013078dd32a732,b8db4d31b6bd1d348ebb2f5d8b4cd0dd6645be24..fb580fb7b540f4cf4015ecd3653ecb7bd3358890
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1244,17 -1251,13 +1244,6 @@@ div.secondary-actions 
    text-align: center;
  }
  
- /* Create a single-line dl */
 -/* Rules for OpenID logo */
--
- dl.dl-inline {
-   dt, dd {
-     display: inline-block;
-   }
-   dd {
-     margin-right: 1em;
-   }
 -.openid_logo {
 -  vertical-align: text-bottom;
 -  border: 0;
--}
--
  /* Rules for rich text */
  
  .richtext,