Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

lib/mastodon/version.rb

@@ -9,15 +9,15 @@ module Mastodon
     end
 
     def minor
-      0
-    end
-
-    def patch
       1
     end
 
+    def patch
+      0
+    end
+
     def flags
-      ''
+      'rc1'
     end
 
     def suffix