Merge branch 'master', remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Updates HTTP_METHOD option to use OptEnum.
Merge branch 'jjarmoc-rails_methods' of github.com:jjarmoc/metasploit-framework into jjarmoc-jjarmoc-rails_methods
Update options to use OptEnum for HTTP_METHOD
Merge branch 'jjarmoc-rails_methods' of github.com:jjarmoc/metasploit-framework into jjarmoc-jjarmoc-rails_methods
Merge branch 'master' into autoload