Merge remote-tracking branch 'origin/master' into gs-master

diff --cc app/javascript/mastodon/components/column_header.js
index c47296a516e6a7f4608cf1fe398d706017ca15c6,80a8fbdb3a635f926ab81d0c00080ed05b8f3fef..71530ffdd68bf72fd7e4b809798edc7f60aad9af
--- 1/app/javascript/mastodon/components/column_header.js
--- 2/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@@ -175,19 -137,12 +175,21 @@@ export default class ColumnHeader exten
        <div className={wrapperClassName}>
          <h1 tabIndex={focusable ? 0 : null} role='button' className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}>
            <i className={`fa fa-fw fa-${icon} column-header__icon`} />
-           {title}
+           <span className='column-header__title'>
+             {title}
+           </span>
 -
            <div className='column-header__buttons'>
              {backButton}
 +            { notifCleaning ? (
 +              <button
 +                aria-label={msgEnterNotifCleaning}
 +                title={msgEnterNotifCleaning}
 +                onClick={this.onEnterCleaningMode}
 +                className={notifCleaningButtonClassName}
 +              >
 +                <i className='fa fa-eraser' />
 +              </button>
 +            ) : null}
              {collapseButton}
            </div>
          </h1>

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge