Merge released '4.x' into master

Author: jmartin-tech

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.16.16)
+    metasploit-framework (4.16.17)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -128,7 +128,7 @@ GEM
     filesize (0.1.1)
     fivemat (1.3.5)
     google-protobuf (3.4.1.1)
-    googleapis-common-protos-types (1.0.0)
+    googleapis-common-protos-types (1.0.1)
       google-protobuf (~> 3.0)
     googleauth (0.6.1)
       faraday (~> 0.12)
@@ -226,7 +226,7 @@ GEM
     pry (0.11.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.0)
+    public_suffix (3.0.1)
     rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -247,7 +247,7 @@ GEM
     rb-readline (0.5.5)
     rbnacl (4.0.2)
       ffi
-    rbnacl-libsodium (1.0.13)
+    rbnacl-libsodium (1.0.15.1)
       rbnacl (>= 3.0.1)
     recog (2.1.16)
       nokogiri

lib/metasploit/framework/version.rb

@@ -30,7 +30,7 @@ def self.get_hash
         end
       end
 
-      VERSION = "4.16.16"
+      VERSION = "4.16.17"
       MAJOR, MINOR, PATCH = VERSION.split('.').map { |x| x.to_i }
       PRERELEASE = 'dev'
       HASH = get_hash