Merge remote-tracking branch 'origin/9-0-stable' into 9-0-stable

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170317203554) do
+ActiveRecord::Schema.define(version: 20170330141723) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"