Merge master with merge of PR #4225

modules/exploits/windows/browser/ie_setmousecapture_uaf.rb

@@ -54,10 +54,9 @@ class Metasploit3 < Msf::Exploit::Remote
       'BrowserRequirements' =>
         {
           :source    => /script/i,
-          :os_name   => OperatingSystems::WINDOWS,
+          :os_name   => 'Windows 7',
           :ua_name   => HttpClients::IE,
           :ua_ver    => "9.0",
-          :os_flavor => "7",
           :office    => /2007|2010/
         },
       'Targets'        =>

modules/exploits/windows/browser/ms13_059_cflatmarkuppointer.rb

@@ -58,10 +58,9 @@ class Metasploit3 < Msf::Exploit::Remote
       'BrowserRequirements' =>
         {
           :source       => /script/i,
-          :os_name      => OperatingSystems::WINDOWS,
+          :os_name      => 'Windows 7',
           :ua_name      => HttpClients::IE,
           :ua_ver       => "9.0",
-          :os_flavor    => "7",
           :java         => /1\.6|6\.0/,
           :mshtml_build => lambda { |ver| ver.to_i.between?(16446, 16490) } # May 17 mshtml to MS13-Jun
         },

modules/exploits/windows/browser/ms14_012_cmarkup_uaf.rb

@@ -44,8 +44,7 @@ class Metasploit3 < Msf::Exploit::Remote
       'BrowserRequirements' =>
         {
           :source      => /script|headers/i,
-          :os_name     => Msf::OperatingSystems::WINDOWS,
-          :os_flavor   => Msf::OperatingSystems::WindowsVersions::SEVEN,
+          :os_name     => 'Windows 7',
           :ua_name     => Msf::HttpClients::IE,
           :ua_ver      => '10.0',
           :mshtml_build => lambda { |ver| ver.to_i < 16843 },