Merge branch 'next-minor' into develop

Gemfile

@@ -51,8 +51,8 @@ gem "uglifier", "4.2.0"
 
 # Configuration
 
-gem "configurate", "0.4.0"
-gem "tomlrb", "1.3.0"
+gem "configurate", "0.5.0"
+gem "toml-rb", "2.0.1"
 
 # Cross-origin resource sharing
 

Gemfile.lock

@@ -117,6 +117,7 @@ GEM
     celluloid-supervision (0.20.6)
       timers (>= 4.1.1)
     chunky_png (1.3.11)
+    citrus (3.0.2)
     cliver (0.3.2)
     coderay (1.1.2)
     compass (1.0.3)
@@ -136,7 +137,7 @@ GEM
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.1.6)
-    configurate (0.4.0)
+    configurate (0.5.0)
     connection_pool (2.2.2)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -725,7 +726,8 @@ GEM
     tins (1.24.1)
       sync
     to_regexp (0.2.1)
-    tomlrb (1.3.0)
+    toml-rb (2.0.1)
+      citrus (~> 3.0, > 3.0)
     turbo_dev_assets (0.0.2)
     twitter (7.0.0)
       addressable (~> 2.3)
@@ -804,7 +806,7 @@ DEPENDENCIES
   capybara (= 3.15.0)
   carrierwave (= 1.3.1)
   compass-rails (= 3.1.0)
-  configurate (= 0.4.0)
+  configurate (= 0.5.0)
   coveralls (= 0.8.23)
   cucumber-api-steps (= 0.14)
   cucumber-rails (= 2.0.0)
@@ -921,7 +923,7 @@ DEPENDENCIES
   sprockets-rails (= 3.2.1)
   string-direction (= 1.2.2)
   timecop (= 0.9.1)
-  tomlrb (= 1.3.0)
+  toml-rb (= 2.0.1)
   turbo_dev_assets (= 0.0.2)
   twitter (= 7.0.0)
   twitter-text (= 3.0.0)