Merge branch 'master' into patch-1

diff --cc docs/Running-Mastodon/Production-guide.md
index f195bb98232f85496ba4c912a97361f767483ff0,af21af546057b54db4dc99a9f921d9cbd5da8fb0..785826acac9364ccffe676ba6a58180dbfd9c244
--- 1/docs/Running-Mastodon/Production-guide.md
--- 2/docs/Running-Mastodon/Production-guide.md
+++ b/docs/Running-Mastodon/Production-guide.md
@@@ -90,7 -90,7 +90,9 @@@ It is recommended to create a special u
  
      sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs file git curl
      curl -sL https://deb.nodesource.com/setup_4.x | sudo bash -
 -    apt-get install nodejs
++
 +    sudo apt-get install nodejs
++
      sudo npm install -g yarn
  
  ## Redis