Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml

app/javascript/styles/mastodon/about.scss

@@ -491,7 +491,7 @@
         line-height: inherit;
         font-weight: inherit;
         margin: 0;
-        padding: 15px;
+        padding: 0;
       }
 
       .column {