Merge remote-tracking branch 'origin/depfu/update/ffi-1.9.25' into github_master

Author: halfbyte

Gemfile.lock

@@ -66,7 +66,7 @@ GEM
     execjs (2.7.0)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.25)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
     i18n (0.8.6)