Merge branch 'stable' into develop

Gemfile

@@ -252,7 +252,7 @@ end
 group :test do
   # RSpec (unit tests, some integration tests)
 
-  gem "fixture_builder",   "0.3.6"
+  gem "fixture_builder",   "0.4.1"
   gem "fuubar",            "2.0.0"
   gem "rspec-instafail",   "0.2.6", require: false
   gem "test_after_commit", "0.4.1"

Gemfile.lock

@@ -200,7 +200,7 @@ GEM
     ffi (1.9.8)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fixture_builder (0.3.6)
+    fixture_builder (0.4.1)
       activerecord (>= 2)
       activesupport (>= 2)
     fog (1.30.0)
@@ -413,7 +413,7 @@ GEM
     mime-types (2.5)
     mini_magick (4.2.3)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     mobile-fu (1.3.1)
       rack-mobile-detect
       rails
@@ -753,7 +753,7 @@ DEPENDENCIES
   faraday (= 0.9.1)
   faraday-cookie_jar (= 0.0.6)
   faraday_middleware (= 0.9.1)
-  fixture_builder (= 0.3.6)
+  fixture_builder (= 0.4.1)
   fog (= 1.30.0)
   fuubar (= 2.0.0)
   gon (= 5.2.3)
@@ -856,4 +856,4 @@ DEPENDENCIES
   will_paginate (= 3.0.7)
 
 BUNDLED WITH
-   1.10.2
+   1.10.3