Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.

lib/mastodon/version.rb

@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc1'
+      'rc3'
     end
 
     def to_a

lib/tasks/mastodon.rake

@@ -561,7 +561,7 @@ namespace :mastodon do
 
     desc 'Generates home timelines for users who logged in in the past two weeks'
     task build: :environment do
-      User.active.select(:account_id).find_in_batches do |users|
+      User.active.select(:id, :account_id).find_in_batches do |users|
         RegenerationWorker.push_bulk(users.map(&:account_id))
       end
     end