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

diff --combined app/assets/stylesheets/common.scss
index 9aefd3d695978e929ac7517497c26a13f6bbb3ba,7871e8a41ab3f1c67fcb934194347fae8596d883..d8f13287bf5b53f6127178beb7945f3b8a5c02a4
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -10,17 -10,17 +10,12 @@@ body 
    font-size: $typeheight;
  }
  
- p > img {
-   width: auto;
-   max-width: 100%;
- }
- 
  time[title] {
    text-decoration: underline dotted;
  }
  
  #container { position: relative; }
  
 -.small_icon {
 -  vertical-align: middle;
 -  margin-right: $lineheight * 0.25;
 -}
 -
  /* Rules for icons */
  
  .icon {
@@@ -924,6 -924,11 +919,6 @@@ div.secondary-actions 
    .sprite.rules {
      /*rtl:ignore*/ background-position: -350px 0;
    }
 -
 -  .icon.note {
 -    background-color: #333;
 -    border-radius: 4px;
 -  }
  }
  
  .site-about #content {