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

Conflicts:
 	config/i18n-tasks.yml

app/javascript/mastodon/features/compose/index.js

@@ -97,7 +97,7 @@ export default class Compose extends React.PureComponent {
             <ComposeFormContainer />
             {multiColumn && (
               <div className='drawer__inner__mastodon'>
-                <img alt='' src={elephantUIPlane} />
+                <img alt='' draggable='false' src={elephantUIPlane} />
               </div>
             )}
           </div>

app/javascript/styles/mastodon/components.scss

@@ -1842,6 +1842,9 @@
     object-position: bottom left;
     width: 100%;
     height: 100%;
+    pointer-events: none;
+    user-drag: none;
+    user-select: none;
   }
 }