Merge remote-tracking branch 'origin/master' into gs-master

  Conflicts:
 	Gemfile.lock
 	config/application.rb

1 files changed, 2 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index e7eadbf41..67d10252b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,9 +10,10 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180402040909) do
+ActiveRecord::Schema.define(version: 2018_04_02_040909) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "pg_stat_statements"
   enable_extension "plpgsql"
 
   create_table "account_domain_blocks", force: :cascade do |t|