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

Conflicts:
	db/schema.rb

db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb

@@ -0,0 +1,10 @@
+class AddIndexOnStatusesForApiV1AccountsAccountIdStatuses < ActiveRecord::Migration[5.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106
+    end
+    remove_index :statuses, name: :index_statuses_on_account_id_id
+  end
+end