Merge branch 'master' into foss

Author: mlinksva

Gemfile.lock

@@ -25,9 +25,9 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.2)
+    ffi (1.11.3)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
     github-pages (202)