Merge branch 'master' into uppy-day-10

packages/@uppy/companion/src/server/Uploader.js

@@ -225,7 +225,7 @@ class Uploader {
    */
   emitProgress (bytesUploaded, bytesTotal) {
     bytesTotal = bytesTotal || this.options.size
-    if (this.tus.options.uploadLengthDeferred && this.streamsEnded) {
+    if (this.tus && this.tus.options.uploadLengthDeferred && this.streamsEnded) {
       bytesTotal = this.bytesWritten
     }
     const percentage = (bytesUploaded / bytesTotal * 100)

website/src/docs/transloadit.md

@@ -8,6 +8,10 @@ permalink: docs/transloadit/
 
 The `@uppy/transloadit` plugin can be used to upload files to [Transloadit](https://transloadit.com/) for all kinds of processing, such as transcoding video, resizing images, zipping/unzipping, [and much more](https://transloadit.com/services/).
 
+> If you're okay to trade some flexibility for ergonomics, consider using
+> the [Robodog](/docs/robodog/) Plugin instead, which is a higher-level abstraction for 
+> encoding files with Uppy and Transloadit.
+
 <a class="TryButton" href="/examples/transloadit/">Try it live</a>
 
 ```js