diff --git a/Gemfile.lock b/Gemfile.lock
index feb2674228..0c2ce77a00 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,7 +14,7 @@ GIT
 
 GIT
   remote: https://github.com/pry/pry
-  revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
+  revision: f19d3e2ae86a677e1e926016fa1a5763675e3659
   branch: master
   specs:
     pry (0.10.4)
@@ -24,7 +24,7 @@ GIT
 PATH
   remote: .
   specs:
-    metasploit-framework (4.14.17)
+    metasploit-framework (4.14.18)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -150,12 +150,12 @@ GEM
       multi_test (>= 0.1.2)
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
-    cucumber-rails (1.4.5)
+    cucumber-rails (1.5.0)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 4)
-      mime-types (>= 1.16, < 4)
+      mime-types (>= 1.17, < 4)
       nokogiri (~> 1.5)
-      railties (>= 3, < 5.1)
+      railties (>= 4, < 5.2)
     cucumber-wire (0.0.1)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -171,7 +171,7 @@ GEM
     filesize (0.1.1)
     fivemat (1.3.3)
     gherkin (4.1.3)
-    google-protobuf (3.2.0.2)
+    google-protobuf (3.3.0)
     googleauth (0.5.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
@@ -196,14 +196,14 @@ GEM
       nokogiri (>= 1.5.9)
     memoist (0.15.0)
     metasm (1.0.3)
-    metasploit-aggregator (0.1.3)
+    metasploit-aggregator (0.2.0)
       grpc
       rex-arch
-    metasploit-concern (2.0.3)
+    metasploit-concern (2.0.4)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-credential (2.0.8)
+    metasploit-credential (2.0.9)
       metasploit-concern
       metasploit-model
       metasploit_data_models
@@ -211,7 +211,7 @@ GEM
       railties
       rubyntlm
       rubyzip
-    metasploit-model (2.0.3)
+    metasploit-model (2.0.4)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
@@ -231,7 +231,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     msgpack (1.1.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
@@ -240,7 +240,7 @@ GEM
     net-ssh (4.1.0)
     network_interface (0.0.1)
     nexpose (6.0.0)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -258,7 +258,7 @@ GEM
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
     public_suffix (2.0.5)
-    rack (1.6.5)
+    rack (1.6.6)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
@@ -281,48 +281,48 @@ GEM
     redcarpet (3.4.0)
     rex-arch (0.1.4)
       rex-text
-    rex-bin_tools (0.1.2)
+    rex-bin_tools (0.1.3)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.9)
-    rex-encoder (0.1.3)
+    rex-core (0.1.10)
+    rex-encoder (0.1.4)
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.13)
+    rex-exploitation (0.1.14)
       jsobfu
       metasm
       rex-arch
       rex-encoder
       rex-text
-    rex-java (0.1.4)
-    rex-mime (0.1.4)
+    rex-java (0.1.5)
+    rex-mime (0.1.5)
       rex-text
-    rex-nop (0.1.0)
+    rex-nop (0.1.1)
       rex-arch
-    rex-ole (0.1.5)
+    rex-ole (0.1.6)
       rex-text
-    rex-powershell (0.1.71)
+    rex-powershell (0.1.72)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.2)
       rex-text
-    rex-registry (0.1.2)
-    rex-rop_builder (0.1.2)
+    rex-registry (0.1.3)
+    rex-rop_builder (0.1.3)
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.5)
+    rex-socket (0.1.6)
       rex-core
-    rex-sslscan (0.1.3)
+    rex-sslscan (0.1.4)
       rex-socket
       rex-text
-    rex-struct2 (0.1.1)
-    rex-text (0.2.14)
-    rex-zip (0.1.2)
+    rex-struct2 (0.1.2)
+    rex-text (0.2.15)
+    rex-zip (0.1.3)
       rex-text
     rkelly-remix (0.0.7)
     robots (0.10.1)
@@ -347,7 +347,7 @@ GEM
       bindata
       rubyntlm
       windows_error
-    rubyntlm (0.6.1)
+    rubyntlm (0.6.2)
     rubyzip (1.2.1)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -373,7 +373,7 @@ GEM
       thread_safe (~> 0.1)
     tzinfo-data (1.2017.2)
       tzinfo (>= 1.0.0)
-    windows_error (0.1.1)
+    windows_error (0.1.2)
     xmlrpc (0.3.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
diff --git a/lib/metasploit/framework/version.rb b/lib/metasploit/framework/version.rb
index 78b169f801..dfcd6d11ee 100644
--- a/lib/metasploit/framework/version.rb
+++ b/lib/metasploit/framework/version.rb
@@ -30,7 +30,7 @@ module Metasploit
         end
       end
 
-      VERSION = "4.14.17"
+      VERSION = "4.14.18"
       MAJOR, MINOR, PATCH = VERSION.split('.').map { |x| x.to_i }
       PRERELEASE = 'dev'
       HASH = get_hash