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

 Conflicts:
	db/schema.rb

diff --cc db/schema.rb
index b480c9c46253d88a1f1e06b0b0fbf16a0e502fe0,d1722fa29964936f45d32c3da4df2aa4b1b6d16e..11ca1223584122cea51fad370675781e9d984c10
--- 1/db/schema.rb
--- 2/db/schema.rb
+++ b/db/schema.rb
@@@ -418,8 -409,7 +418,8 @@@ ActiveRecord::Schema.define(version: 20
      t.bigint "account_id", null: false
      t.bigint "application_id"
      t.bigint "in_reply_to_account_id"
-     t.index ["account_id", "id"], name: "index_statuses_on_account_id_id"
 +    t.boolean "local_only"
+     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
      t.index ["conversation_id"], name: "index_statuses_on_conversation_id"
      t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
      t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"